From fababc97cd0fe05e8b09840a87d3e4e17527c645 Mon Sep 17 00:00:00 2001
From: Moriel Schottlender <moriel@gmail.com>
Date: Fri, 17 Mar 2017 15:35:21 -0700
Subject: [PATCH] RCFilters UI: Close gap between popup and input

Bug: T160213
Change-Id: I9a36be445c3203b599034f8c45297ecd635cbcaf
---
 .../styles/mw.rcfilters.ui.FilterWrapperWidget.less          | 4 +---
 .../ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js     | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index ca19c22fc6..b22abc62c7 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -4,9 +4,7 @@
 	direction: ltr;
 
 	&-popup {
-		// We have to override OOUI's definition, which is set
-		// on the inline style of the popup
-		margin-top: 2em !important; /* stylelint-disable-line declaration-no-important */
+		margin-top: 1px;
 		max-width: 650px;
 
 		.oo-ui-popupWidget-body {
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index a06b103bf5..944ebaa120 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -24,7 +24,10 @@
 
 		// Parent
 		mw.rcfilters.ui.FilterCapsuleMultiselectWidget.parent.call( this, $.extend( true, {
-			popup: { $autoCloseIgnore: filterInput.$element.add( this.$overlay ) }
+			popup: {
+				$autoCloseIgnore: filterInput.$element.add( this.$overlay ),
+				$floatableContainer: filterInput.$element
+			}
 		}, config ) );
 
 		this.controller = controller;
-- 
2.20.1